Fixes by BLU-Scout.